From d9664021cc4917b93ac9a1aa0183e30226f61c7c Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Tue, 9 Nov 2010 18:31:39 +0100
Subject: [PATCH] GtkWidget: Update pango context from style context's font
 description.

---
 gtk/gtkwidget.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 1ceff2d775..75e01df78b 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -8667,12 +8667,22 @@ static void
 update_pango_context (GtkWidget    *widget,
 		      PangoContext *context)
 {
-  GtkWidgetPrivate *priv = widget->priv;
+  PangoFontDescription *font_desc;
+  GtkStyleContext *style_context;
+
+  style_context = gtk_widget_get_style_context (widget);
 
-  pango_context_set_font_description (context, priv->style->font_desc);
+  gtk_style_context_get (style_context,
+			 gtk_widget_get_state_flags (widget),
+			 "font", &font_desc,
+			 NULL);
+
+  pango_context_set_font_description (context, font_desc);
   pango_context_set_base_dir (context,
 			      gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR ?
 			      PANGO_DIRECTION_LTR : PANGO_DIRECTION_RTL);
+
+  pango_font_description_free (font_desc);
 }
 
 static void
-- 
2.30.2